Skip to content

Update dependency @ember/test-helpers to v2.3.0 #3813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Aug 7, 2021
Merged

Update dependency @ember/test-helpers to v2.3.0 #3813

merged 1 commit into from
Aug 7, 2021

Conversation

renovate[bot]
Copy link
Contributor

@renovate renovate bot commented Aug 2, 2021

WhiteSource Renovate

This PR contains the following updates:

Package Change Age Adoption Passing Confidence
@ember/test-helpers 2.2.9 -> 2.3.0 age adoption passing confidence

Release Notes

emberjs/ember-test-helpers

v2.3.0

Compare Source

🚀 Enhancement
Committers: 1

Configuration

📅 Schedule: At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

♻ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.

  • If you want to rebase/retry this PR, check this box.

This PR has been generated by WhiteSource Renovate. View repository job log here.

@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @jtgeibel (or someone else) soon.

Please see the contribution instructions for more information.

@Turbo87
Copy link
Member

Turbo87 commented Aug 4, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Aug 4, 2021

📌 Commit 1f8a7e5 has been approved by Turbo87

@bors
Copy link
Contributor

bors commented Aug 4, 2021

☔ The latest upstream changes (presumably #3807) made this pull request unmergeable. Please resolve the merge conflicts.

@bors
Copy link
Contributor

bors commented Aug 4, 2021

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout renovate/ember-test-helpers-2.x (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self renovate/ember-test-helpers-2.x --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message 
Auto-merging yarn.lock
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
Automatic merge failed; fix conflicts and then commit the result.

@renovate renovate bot force-pushed the renovate/ember-test-helpers-2.x branch from 1f8a7e5 to b84a543 Compare August 4, 2021 19:16
@Turbo87
Copy link
Member

Turbo87 commented Aug 6, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Aug 6, 2021

📌 Commit b84a543 has been approved by Turbo87

@bors
Copy link
Contributor

bors commented Aug 7, 2021

⌛ Testing commit b84a543 with merge 8143112...

@bors
Copy link
Contributor

bors commented Aug 7, 2021

☀️ Test successful - checks-actions
Approved by: Turbo87
Pushing 8143112 to master...

@bors bors merged commit 8143112 into master Aug 7, 2021
@renovate renovate bot deleted the renovate/ember-test-helpers-2.x branch August 7, 2021 13:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jtgeibel jtgeibel

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@rust-highfive @Turbo87 @bors @jtgeibel @renovate-bot